Merge branch 'refs/heads/develop'
Merge branch 'refs/heads/develop'
put early return on one line