Initial Code Commit from Version 2.4