2.18.3.145 performance improvement