Merge branch 'static'