See update #4590447