create-cmd complete
resolved merge conflict from master