Confirmed that there is a bug and given MR works perfectly.
We can merge the MR.