Aware instances content fix
Merge branch 'content' into develop