merged from 'bootstrap-ui' branch