Fix for 'Issue_413'.
Merge branch 'refs/heads/#413' into azure