Final changes before submission
Merge branch 'develop' into release