Merge branch 'develop' into dkunz/feature/sirius