[development] Performance patches