Coordinated change for https://asterix-gerrit.ics.uci.edu/#/c/1799