[xmltv/f39] Pull in selected patches from upstream from v1.2.1 to commit 3711b00137
Summary of changes:
853fd9b... Pull in selected patches from upstream from v1.2.1 to commi (*)
(*) This commit already existed in another branch; no separate mail sent