2.20.3 performance improvement