Actually, I don't see it as a prerequisite for merging this PR, better not to delay that given the conflict trap. Will finish reviewing and merge, and create a follow-up ticket if there is anything that needs to be addressed