GCP-8197 Fix the Context Menu, Alphabetize the options in Tools Menu