Catchup

This merge will bring the fork up to date