Random CS fixes
The specs of the form has been added
Merge pull request #2015 from aRn0D/content/specs

[ContentBundle] Missing specs
Merge pull request #2010 from aRn0D/content/cs_fix

Random CS fixes