Merge pull request #20467 from tobiaspc/njalla