Dropped in changes for 10.0.09F