libinjection sync to v3.6.0

Should auto-merge in.