Merge branch 'small-cleanup' into 'develop'