[TISTUD-5616] Fix build issue with BB CLI