Merge "Revert "DO NOT MERGE: Remove unused variables"" into klp-dev