Tareas #81487 Changes to fix F5 functionality.
Merge branch '2.0-jpa1.0-SNAPSHOT' into 2.0-jpa1.0