Merge "Fix LSA hunt for original reference bug."