**Enhancement Description** A number of improvements have been discovered while working on #9066 and should be addressed (but are not related to #9066)