Merging main developments back into master repo