[MERGE] merge fix for bug 1203841
[MERGE] merge fix for bug 1203841


open-synergy/rma,eezee-it/rma,yanggg1133/rma,rschnapka/rma,ddico/rma,open-synergy/rma,Endika/rma,eezee-it/rma,raycarnes/rma,credativUK/rma,moylop260/rma,Pexego/RMA,Endika/rma,damdam-s/rma,ddico/rma,gurneyalex/rma