adding changes for 0183 CR

merge after agreement