merge in klp-release (no-op)