Merge "Upgrade OAM to 4.0.4"