[KFSQA-644] Started work for KFSQA-644.