fix unreachable code
Merge branch 'BleedingEdge' into experimental