Merging from OS_CREATE to databus2_2.13.6
Merging up to OS_MP_140210-1532