Merge pull request #5154 from TDT-AG/pr/20210628-luci-compat