Merge "UseV2 soft memory calculations" into main