Need to merge after we get viewport params (Bug #13258)