We need to check the main differences between branches 2.1 and 2.2 against 2.3 branch to move the specific changes and test cases from those branches to 2.4 branch to be able to run the test cases against all the current smcp versions