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

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