[803831] Rebased folder gcli and added unit tests