BZ-9741 fixed devmode issue