Merge changes from topics "OAM-350", "OAM-358", "OAM-359"