Merge changes from topic "OAM-318"