AWD-3 Important changes for the pull request.