0.3.0a merge of nightly