Validate category
Merge origin/master