Merge "Fix TAPI artifact deployement issue" into stable/magnesium