Merge branch 'master' into develop
Added checkpoint
Merge branch 'develop'