loki: sync to upstream
6.27.4