Additional PHPDoc comments
Merge branch 'develop' into feature/csrf-prevention
Automatic sharing won't happen
Merge branch 'develop' into feature/csrf-prevention