Merged changes in from version 2