construct_url fail if no tenant
Merge remote-tracking branch 'upstream/master'