Removing test return false
Merge branch 'develop'