Merge of version 2.0.6