[KFSQA-1011] more changes for review