CR fix from Raj for 2014.3