Static pages update
Merge branch 'static-pages'