am a86aeb0c: merge in KFS78N (no-op)

* commit 'a86aeb0c409eb7c812fa53dcfcc6d9ee035b8021':