Merge in debug ui