Merge branch 'muse-spark' into dev