Merge pull request #4286 from TDT-AG/pr/20200724-luci-base