Merged changes from Newfeature branch