[OS-BUILD PATCHv2 4/4] tempfix