developmental master solaris_fix