Merge "Potential fix for Bug: 10241642" into klp-dev