Switched flexboxes.
Merge branch 'release/12.0.0' into develop