Merge "Wait longer for data loading" into nyc-support-24.1-dev