Draft: mpetrenko-alpine-fix

Maksym Petrenko [EPAM / GCP] requested to merge mpetrenko-alpine-fix into master Aug 23, 2022