Make timeout to be 60 minutes
Merge branch 'dev-master'