Merge changes from trunk, mostly to get tests for BACKSLASHEDP.
Authored by: david_costanzo 2019-11-03
Parent: [r5032]
Child: [r5034]