Merge "rollback: Log content model changes"