Merge branch 'wrapper-commands'