BS-7862: fix compilation error after merge from master