Merge fixes - IX-9.20.0