Close #6504 #6510 and #6511
(cherry picked from commit 58a99f2a7c820d86c39a126ccd9db104156966d6)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>