SPC-764 merge fix for mib compiler changes in 1.12 (backported from master)