re-add the parentEl option & fix how the default case is handled
Merge branch 'restore-parent-el' into upgrade