Fixes issue with updating target times.
Merges master into production branch