Merge remote-tracking branch 'origin/cherry-picks-niisaka-epg' into work-plus-niisaka-epg