[v.1.6.0] Improvements for the Bootstrap support