I took over PIPE2D-35, leaving an orphan branch (tickets/PIPE2D-35); the work that was merged to master is on tickets/PIPE2D-35-rhl. It looks as if most of the changes are not needed or are irrelevant, but we should look through the changes and cherry-pick any that we do want.