minor transition fixes
Merge remote-tracking branch 'upstream/0.4.0' into 0.4.0