Merged with upstream.
Merge branch 'master' into schedule-feature