The commit fixing this issue has changed a bit, it would be great if you could
confirm the latest version of the MR works well for you.

Thanks!