Added explicit break.
Merge branch 'develop'