Merge remote-tracking branch 'origin/master'
PLA-1305 get url from different source