Merge 3.5.0a3 release engineering changes back into trunk.