Merging commits from maebert