Fix issue in SR branch wrt AAX default values