Closes #984
Merge branch 'develop' into feature-standalone