Merge branch 'master', remote branch 'origin' into bug336941-state-dumping-with-framework-hooks