KTEST: Bugfix: Issue #128
Merge remote-tracking branch 'origin/master'