CLD-3608 BE - build fix