Close #11705 #11703

(cherry picked from commit a3f6eeeb90422e40a2650d05be667b410aec3668)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>