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

* commit '13d66d8456ec4661a9eda5f26e72b1d9188bfbe6':
  Fix: Context menu can contain obsolete suggestions.