Merge branch 'catch' into v1.x