Merge branch 'spartan' into hm/jalons-notifications