[APR-2053]wlbt: NAN R2 integration fxes