Merge of 2.0.4.002 into public 1.4.4-release branch

Merge of 2.0.4.002 into public 1.4.4-release branch #10