Fixed: Issue 477 - Final code enhancement for X10Cmd