Merge "Debug mode" and "Clean Up World Settings output" patch files

Signed-off-by: Steven Downer <grinch@outlook.com>