Re: merge of clumens branch onto master