Merge "Fix an exception caused by incorrect data handling" into klp-dev