Prevent unintentional generation of expensive manifests (#5533, #4050, #3571)

Prevent unintentional generation of expensive manifests (#5533, #4050, #3571) #11727