[KFSQA-633, KFSQA-634, KFSQA-636, KFSQA-637] Merge to master