Merge back APEI material for v4.16.