Important Updates for v14.1.x and v16.1 as well