Merge "Allow overriding data request rate limit window size from command line" into main