Fixed bug APD-773
Merge branch 'APD-773-IMR' into develop