Merging changes from dev branch