Fix calculate address and prefix usage.

Merged Andrey Vertiprahov requested to merge fix-avs-calculate-address-usage into master

Fix calculate address and prefix usage.

Merge request reports