PR to merge static-pages-ex into master