Merge "Enable options for customizing deploy workflow" into stable/euphrates