Merge "Revert "DO NOT MERGE: Fix compiler warnings and enable -Wall -Werror"" into klp-dev