Merge of changes made in dev branch.