I have completed the fix, and now it is merged.