Refs #9413 add more corrections
Refs #9413 functions for duplicated code
Revert "Refs #9413 functions for duplicated code"

This reverts commit 3de74fc60d09dc4679ee8bd2db7540b89cb722b5.
Revert "Revert "Refs #9413 functions for duplicated code""

This reverts commit 1cd50932611de84ea24da2e57c383f1135812635.
Refs #9413 fix Windows build
Merge remote-tracking branch 'origin/feature/9413_AnvredCorrections_TOPAZ_additions'