Added fix for Bug 20869