Merge "Fix: Context menu can contain obsolete suggestions." into nyc-dev