ACE-M2 sample layout update