Integrated last commit changes by DGrid