Merge "Narrow previous fix for this issue." into klp-dev