Merge "dovetail: fix wrapper disable problem"