Merged the changes that have been done before pushing to main sage development branch.