Backport from championship branch

Backport from championship branch