Revived mysterious lost commits after latest release/merge
Merge branch 'develop'