A catch up of changes in my v2.0.1-dev branch