KFSQA-628 ready for review.