Merge "[PORTAL] Fix Heap config generation"