Tareas #81487 Changes to fix F5 functionality.