A320: merge trunk to release/2020.3
Authored by: legoboyvdlp 2020-10-27
Parent: [r5217]
Child: [r5219]