Merge branch 'hotfix/1.0.11'
Merge branch 'develop'
handle nil url
Merge branch 'hotfix/fix-nil-url' into develop