Merge "Separate timer for availability and performance" into main