Merge "Fix and cleanup smart replies checking"