As part of GVA migration #175, the network layer has been rewritten. Now, that gva is discontinued, let's apply the network layer improvements to bma.