Steve Ebersole, until HHH-9582 and HHH-9584 are addressed, the new Maven bytecode enhancer isn't useable. So could this fix either be made to both the old and new enhancer or could this issue be marked as blocked by those 2 issues before it's resolved?