Will help factorization with the pending -af patch, and add some checks missing in the original code.
Attach a file by drag & drop or click to upload
