Merge branch 'docs_cheatsheet_fix' into 'develop'