Merge proposals dependent on lp://qastaging/~andreas-pokorny/mir/apply-transformation-to-surface

1. apply-transformation-to-surface
2. Dependent merge proposals