Catchup

This merge catches this fork up to the progress of the main branch