Merge pull request #1420 from priya-anand/patch-7