Accept server profile with null value
Fixing ErrorDescriptor constraint
Merge branch 'fix/bugfix_cycle' into develop