Sync macOS version's code with the v2 Linux/Windows code (by referring `core-shared`) #395