Confirm CommentsAwareEnter * compatability
Merge pull request #1667 from Suor/master

Confirm CommentsAwareEnter * compatability