Merge pull request #7827 from spycrab/issue_11588 MenuBar: Implement proper update-capabilities check
