Merge "Suppress test differently" into klp-dev