Merge branch 'net-const'