Merge branch 'upstream_master'
Merge branch 'conditional'