master
BAEL-7032: Improvement to conditional mapping by using @Condition and added tests
BAEL-7032: updated formatting