(cherry picked from commit d2408a9324f08fde9cb109490bf8fbf04f748531)
* backported from 245220985b for minenux
245220985b