Port 2p to new spatial params

5 jobs for !2950 with feature/port-2p-to-new-spatialparmas
latest merge request