2 Years Ago
merge from connected_time_fix