Merge of temporary branch, as I had some experimental code in local devel branch while merging devel to master.