Merge pull request #13364 from mattwire/activitytype_pseudoconstant