Merge "Fix querying of multiple subtypes" into main