Next for upstream

in preparation for M35.