Merge pull request #3627 from ace20022/ext_subs_label