Net runtime optimization (25/26)

Net runtime optimization