am 95f100ba: Merge "Performance fix for multiple language subtypes"

* commit '95f100ba404c3f905739db628ec71b7c1b7b5ace':
  Performance fix for multiple language subtypes