Revert "revert all next branches to master after initial next merge"

This reverts commit 903ef24f20ab4b57072f6807937196606c72e644.