Fix scaling with Heat and Neutron

Closes-bug: #1376829

Change-Id: Icbc950cc9e5f31871ea96dd1c7846fafdad444f4
Merge "Fix scaling with Heat and Neutron"