Merge branch 'bug-fixes'
Merge branch 'develop'
whitespace