@wluyima , do we really need a duplicated class with a 1.10 profile for things like this?  Can't we just add a conditional line around that particular HQL clause so that it only is included if the openmrs version is 1.10 or higher, and then just have one evaluator for all versions?