JPQL tester
Merge origin/master