[COMMIT] epia-m support