Merge of Adamas into unstable branch.