Revert "Revert "JPA Terminado""

This reverts commit 90bcb07754d37f8fa0daae8dd46fb95df3065ff6.
Revert 236a8f3..3641439

This rolls back to commit 236a8f397bfd9a69ee60ed4d172d7cdb5234bcf5.