bug 4009 & 4010 add required fields