As of 5.17.6 (and current blead) this appears to work once again as expected. Can this be closed or would we like a bisect of what fixed it? -- Matthew Horsfall (alh)