master merge completed with branch KFSQA-623