Merge branch 'spartan' into spartan-connector-purge-update