The source project of this merge request has been removed.
Add changes in Rich code and macros from dev branch
The merge request ports the commits 16307, 16385-16386, 16426-16429, 16452, 16454, 16500, 16548 and 16566 from the mcbm2020 development branch.