(cherry picked from commit 458ef81f)
Co-authored-by: Andrius Štikonas andrius@stikonas.eu
BUG: 503148