Merge branch 'jk/promote-ggg'