Deleted (tr)with ComboBox, minor fix
Merge remote-tracking branch 'origin/AndrewS/FixFuncMinor' into FixForMErge