Merge "Pending op fix didn't merge properly from KLP-dev."