Commit of code for the 2.4 SS version