[BW]: [NIP] Further changes related to linux build configuration