[TIMOB 16425] Changes to CLI and build process