CDB-877 #Fixes loading of params in the URL
Merge remote-tracking branch 'origin/feature/CDB-877' into release/2.4.0