2 Commits (EC-502-cherry-pick)