mklibs: merge r31259