fixes 3970 - adds support for os default templates