A960E

production change #2800

production change #2812

production change #3023