Change to GridTools GridPreferences handling for SCI-1244