Integrate optimization from Rasmus that allows avoiding of a stat, when data is available from the SAPI