Merge master to get time available adjustments