Update the file in the testing branch
Merged the changes from testing branch