Merge branch 'sh/g3-prep'