Add layer-value default values
Merge branch 'master' into projectmanager