* new branch for misc cleanup

* add item to resolve #6319

* fix grammar

* re-collate