(cherry picked from commit fc0e4e182275a2adb5cbcbe548262ccc94d53cac)

Conflicts:

	master/bt5/vifib_base/bt/revision