merge squash 4.3 update (WIP)
Revert WCNSS config and NV items back to MR1.1