Merge "Simplify the burst time logic" into main