merging master [KFSQA-708]