Rework re #239 to work off post-1.13 codebase. Closes #239
Merge branch '1.13' into 1.14