Merge changes from topic "OAM-279"