NXP-15892: better concurrent access to adapters (backport)