Merge branch 'experimental' into v0.5