Merge "Update QS defaults list"