KFSQA-631 should be ready to merge