[OC-7673] Improve readability for non vcloud users