Merge pull request #4436 from ace20022/ext_sub_details