Merge branch 'pipeline-extension-coffin-compatibility'