Merge in changes from trunk (mostly new keyboard shortcuts)
Authored by: david_costanzo 2019-09-01
Parent: [r5004]
Child: [r5006]