Merge updates from UristMcStation