Merge branch 'master-fixes' into stm-flash-fixes