Merge pull request #3609 from xmcclure/checked-imageset