Merge changes from IX-9.10.0