Comprehensive update of changes submitted over the last several years including fixes to issues pending against prior version
Copied pp and poetry marks from en_ulb, Dec 2022