Merge pull request #1421 from priya-anand/patch-6