Merge "Slice and dice app ops - Settings"