Merge of changes from devel branch