This should finish AFIO, apart from minor items and Paul's stuff

Try again to kick Jenkins ...