Merge branch 'cherry-picks-niisaka-epg' into work-plus-niisaka-epg