Merge "Don't use implementation-defined format with CPU consumers" into klp-dev