* Integration of the previous logic to 2.4.0 * Unit and ITs passing * refactored the template matching logic