ewolinetz 74c44828c1 Cherry picking from #3644 8 gadi atpakaļ
..
main.yaml 74c44828c1 Cherry picking from #3644 8 gadi atpakaļ