Merge branches 'static-pages' and 'master' into filling-in-layout
5th before user generation