Changes

Summary

1. build faster without heap images for minor imports;
2. proper order for entries from multiple profiles, notably "AFP";