Merge changes from topics "OAM-344", "OAM-345"