Merge "Make sure to compare subtype language with system language." into nyc-dev