Dev 0 3 1

Some work that was quarantined in the dev_0_3_1 branch during the release period.