Merge pull request #7533 from mbauskar/minor-fixes

[WIP] Address and Contact Fixes