Finally Commit for implementing the changes for 3.0.5