Make it harder for category to be wrong

This was properly addressed in master, this could be a useful mitigation for 6.3.

BUG: 491703


Not to be merged to master

Merge request reports

Loading