Revised condition
Merge branch 'develop'