Work commit #1 by v-mdolgalov@expedia.com