Replace promise.fail() to promise.catch()
Merge branch 'develop'