Fix-2
Merge branch 'command-configure' into test-1
Fix-3
Merge branch 'command-configure' into test-1
Fix-4
Merge branch 'command-configure' into test-1