Be more strict about PersonType assignment Original-merge: b56de6493f67cd1cdc43b47745ae66908d1aef41 Merged-by: crobibero <cody@robibe.ro> Backported-by: Bond_009 <bond.009@outlook.com>