Merge branch 'jc/make-static'