Merge branch 'master' into KFSQA-591