Merge static-pages branch