Final? stability fix
Merge branch 'master' into Major-Update