Merge pull request #4053 from TDT-AG/pr/20200515-luci-base