Fix: CommandBuilder cannot add flag values
Merge branch 'develop'

* develop:
  Fix: CommandBuilder cannot add flag values