Merge pull request #3712 from TDT-AG/pr/20200303-luci-base