*** TEST RELEASE - Fix NPE with ghost associations