KSFQA-791 ready for review