Do check if the template starts with "fe_page" instead of requiring it to be "fe_page".
Merge branch 'master' into dev