planning: Update from 7/8