Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a' * commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a': NFC settings cleanup.
Merge commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a' * commit 'c0e93a849f82c97b847c9ad39b18e594f3bb3f5a': NFC settings cleanup.