[KFSQA-901] Changes for KFSQA-901.