v0.9.9.7 from branches/i-cambell/ to trunk
Authored by: i-campbell 2020-10-25
Parent: [r483]
Child: [r485]