Minor merge changes
Merge branch '3.5-ancr' into 3.6-ancr