Merge "Fix issue #6730064: When turning off Nakasi, it very often..." into jb-dev