BS-8676: fix imports