bring in ignoreenclosures from development-main