Merge "Fix recursive locking bug." into klp-dev