Soumya M.

Hi @alexkuhn I do agree that making such artificial splits will introduce a slight complication with code refactoring, but even if I go with your approach of setting a flag...

@alexkuhn I've pushed another approach which should work as you have suggested, if I understood it correct. Let me know if this needs any changes

@tde-banana-odoo I hope this title works, also updated the ent. commit hash to PR link