Merge "Fix comparison sign warnings." into klp-dev