Sync with latest libnpengine