Merge in changes from trunk to get fixes to auto completion
Authored by: david_costanzo 2020-04-18
Parent: [r5209]
Child: [r5211]