KFSQA-613 ready for review