Merge "Fixed the LP bug 993739."