Merge pull request #2969 from TDT-AG/pr/20190806-luci-base