Add bootstrap options needed since !4560 (merged).
bootstrap
Fixes: #20987 (closed) Backport: release