Bug Fixes Project Enhancements - to address issues #21313, #21310, #21309, #21305, #21296
Merge pull request #142 from andersdd/proj_enhancements

Bug Fixes Project Enhancements - to address issues #21313, #21310, #21309, #21305, #21296