finalized CC-94 and fixed ZEN-14344