KSFQA-643 stashing changes to do code reviews.