Merge branch 'bug-fixes' into 'master