KFSQA-791 clean up for merge with master