Merge "Don't suggest invisible for aggregation" into jb-dev