Weekly update of production - Extension 1 / Update 2

Cumulative update for production branch