Merge branch 'master' into develop
Adding dependency notes
Merge branch 'develop'