Fix/radius accounting

Backports accounting fix now in devel.