changes for 24.4