Merge "Remove outdated task bounds adjustment" into main