4.2+ stable

This version is mostly identical to main branch with only 4.2 support added and no major changes to behavior. Future releases may deviate as I'm adding more opinionated features and will not pull request back to main branch while it remains on 3.6