I have created a MR with updated changes, please review