Merge "Fix incorrect comparison" into klp-dev