The rebasing is problematic, I have created two new MRs for each of the implementation. See !648 and !649 .
Validated by