implemented net from Backport v3.12.1-1-0-g43eec7a