I am able to reproduce the issue, And the given MR works well.