Merge branch 'staticsync-as-a-module'