Merge develop into setting_groups to rebase (found an old commit without all the other change sets in already)