re #929 - Nooku Platform update (Flexbox issue)
Merge branch 'feature/929-nooku' into staging