Merge branch 'spartan' into hm/notifications-roles