Upstream merge
Upstream merge, disable-mark commit no longer required