Merge pull request #2642 from TDT-AG/pr/20190329-luci-base