Merge armem/dev into refactor/new_arch(_armem)

@fratty Maybe we can do this together? There are some merge conflicts due to changes that where necessary on the previous state of armem/dev (due to usages in dependent projects)