PR: 248141 Submitted by: Robson Mantovani <robsonmantovani@gmail.com> (maintainer) MFH: 2020Q3 (blanket: bugfix release)