Merge branch 'misc-fixes' into 'master'