Closing this issue due to lack of activity. If this is still a problem in the latest release, please re-open this issue with a valid test case and entity mappings that clearly illustrate the problem.