Merge "Added extra check to CLI command that was not checked for" into tm-qpr-dev