Jeremypw/fix afc mount

[jeremypw]

Not sure how, but the first commit appears to have been incorporated into main without review (??), fortunately after the latest release. The branch requires modification of the tests as the expected result of 'fixing' an afc protocol address has changed.

[jeremypw]

Converting to draft pending some clarification from the OP.