Backporting changes to Arpix from other branches