Merged Michbeck and Troy changes, added to main