Merge changes from topic "OAM-304"