Merge branch 'g-clear-pointer-no-side-effects' into 'master'