Merge branch 'net-break-after-goto'