New constructor and query
Using named query
Merged from BRANCH_PLATFORM_5