Merge pull request #970 from sagar-apple/post_merge_review

Address post merge review comment