This is a follow-up MR to fix issues pointed out in !65628 (merged)
Tagging @jkremer @lidiaz @astruebi