Merge "Add the ability to turn off NAS capabilities individually"