Alpha 3 merge

Merge of recent changes from rc-2.3.1 to alpha-3.0