synch with cruft-common future split