EMPIREDB-306
previous implmentation did not work as expected and didn't work under Mojarra.
9 files changed