Fix #11400 and #11431
Merge branch 'master' into pr/11435

Conflicts:
	dist/css/bootstrap.css
	dist/css/bootstrap.min.css