Merge in changes from trunk (to get new ambigious translation warnings)
Authored by: david_costanzo 2020-03-01
Parent: [r5133]
Child: [r5135]
