Page Not Found issue fixed in the CmsController.
Merge branch 'master' into dev