Merge "Make RandomInCat work for cats starting with namespace"