FORGE-1060 Added support for populating associations