Merge commit 'e0100f4736b987af22a719f740c3c25793b0a95e' * commit 'e0100f4736b987af22a719f740c3c25793b0a95e': Addressed reviewer comments.