Fix for BPMS-954 and implemented BPMS-1031