Changes based on OpenESPI/OpenADE call on 12/8/2014.