Merge pull request #2310 from andreimaxim/3.3.0-preview3

Merge pull request #2310 from andreimaxim/3.3.0-preview3 #250