moving debug option: #MSG-17 In Progress