Merge "Update Settings owners list"