commit by UserB
Fixed Conflict merge dev_1.0_userB to master