Merge "Adding mock-detached util function and cleaning up util help output"