Merge changes from IX-9.20.0 - live optimizations