am edb74965: merge in klp-release (no-op)

* commit 'edb749657954b65ecf4d1dc884659f90a2e57f90':