Merge "BUG-633: allow bootstrap customization"