Given MR works well.
We can merge, If this feature is needed.