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