[#74663382 #74662140] fixes for some timing issues