Added fix for Bug 20869
Merge pull request #1127 from oleg-st/master

Added fix for Bug 20869