410.25 updated for easier debugging - no functional changes