(TR #2121) fr and he TY updates

Change-Id: Ibe6ce2241ccd90862a48f4702b7d10fb9b165968
Merge master into deployment

Change-Id: Ic28f19afac8e557497c181422ff117cca8595de4