Merge "Remove RetryFilter from defaults"