mckaygerhard
880579ea15
* Minor cleanup and improvements, cherry picked modified from commit
66b1aafb4b
* Minor cleanup and improvements, cherry picked modified from commit
66b1aafb4b