Merge branch 'hotfix-4.9.4'
Fixed form printing in admin mode
Fixed bug with header layout.
Merge branch 'hotfix-4.9.5' into develop