KTEST: Temporary bugfix for Issue #84
Merge remote-tracking branch 'origin/master' into work