[TISTUD-5616] Fix build issue with BB CLI
Merge pull request #185 from pec1985/tistud-5616

[TISTUD-5616] Fix build issue with BB CLI