Merge "Do not return stale subtypes" into jb-dev