Merge changes from topic "OAM-289"