Merge "Fix soft reference clearing issue." into klp-dev