A320-family: Merge trunk into release/2020.3
Authored by: legoboyvdlp 2020-10-24
Parent: [r5209]
Child: [r5211]