Merge "Use correct method for sparsearray lookup" into klp-dev