Revert "1st time Merge branch 'br1'"

This reverts commit a2720ba2519aa135647319be65c218e35fb31797, reversing
changes made to 6334c605799da11e84a2ac2a11dd5a419c625409.

Conflicts:
	test