merge in KFS78N (no-op)