[sr-dev] git:4.4:3794ecf8: Merge pull request #1272 from btriller/fix-hep3-capture-id-backport-4.4