PM-4977_bugfixing_layout_update