Merge "Fix bug when overlaying middle arfs in multi-arf groups."