Commenting auto resolver.
Merge branch 'feature/comment-autoresolver' into develop