fix parameters and inhertance; template server manifests
Merge branch 'hotfix/1.2.0'