more cleanup and fixed typos
Merge remote-tracking branch 'origin/Experimental-RELEASE' into Stable-RELEASE