Typo fix: double 'and'
Merge branch 'develop'