Remotes/trunk - sync to libinjection v3.7.1

sync to libinjection v3.7.1