Commit coupled bootstrap CSS (fix from previous merge)
Merge branch 'develop' into release/3.2