Merge "Policy versions update for maintenance release" into casablanca