Develop - bugzids 3383, 3390