Merge pull request #3706 from wsoltys/iso_name