Changes for 0.50
Merge branch 'release/0.3x'