[#43563493] Works for old style pipelines
Merge pull request #756 from JamesGlover/43563493_for_all_pipelines

[#43563493] Works for old style pipelines