Hi Jani, Thank you so much for the suggestions! I've submitted a V2 patch with the updated code, and also a patch test request which should come back soon. Please let me know if the new version looks good. Best regards, Ziqi