merge do branch para o trunk sem o dwmemtable novo
Authored by: xybersportgames 2022-09-07
Parent: [r3133]
Child: [r3135]