Merge of 0.4.1 to develop.