Merge pull request #1753 from rmehta/develop

Address Template