resync with develop, fix the many conflicts, and make sure changes made in easyconfig.py are integrated in this branch too