Apply MDL-43824.
Merge pull request #347 from gjb2048/master_MDL-43824

Apply MDL-43824.