U4-5895 follow up on U4-5889