New change for 6.3.9