SAMZA-245; improve system consumers performance