dynamic bootstrap + minor changes
Merge pull request #2731 from sebv/dynamic-bootstrap

Dynamic bootstrap + minor changes