PR to merge static-pages into master