Merge branch 'upstream-diy'

# By Diy Upstream
* upstream-diy:
  diy 2021-05-26 (b21d798e)
9 jobs for add-update-diy in 2 minutes and 14 seconds