Develop- bugzids 3437 and 3400