Fix
Merge branch 'command-configure' into test-1