Cherry-picking from d3cf598 / Switch from URI params to URI query string
Cherry-picking from commit 1ebeb2c / Remove unused uriparams variable + done TODO