A320; merge from 20a4fb2656460824a817fcca7e9322fea0fd8f91
Authored by: r-harrison 2020-03-10
Parent: [r4616]
Child: [r4618]