CURRIKI-6099 Changes to 21em to avoid override of fields