Merge "Fix a bug where the subtype is not initialized correctly"