Merge "Doc change: 4K -> 4kb" into jb-dev