Merge branch 'dev/gfp-flags' into for-chris-4.6