Sync fixes from AR 3.2.13 uniqueness validator