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