Merge branch 'docs_cheatsheet' into 'develop'