PERF-91 Fixed KB927917