Develop

Implemented changes for task # 5703: