Merge branch 'develop' into convert-to-psr-2