Finish 8.23 changes