Merge "Add settings for individual NAS components"