Addresses issues as described in repos/generated-data-platform/datapipelines!60 (diffs, comment 7113)