This is a follow up of comments made in D8539 about splitting some code to common module
Related D8539
Related T4591