Merge branch 'spartan' into hm/document-classification