Merge changes from topic "OAM-324"