Simple & Usable content fix
Merge branch 'simple-and-usable-content' into dev