#737 Creating infrastructure for master pages