Merge pull request #5506 from umairsy/17jun

small fixes