Merge "core: fix arithmetic on a pointer to void"