Feature backport prebuilt rejig