Merge branch 'dkunz/feature/sirius' into develop