ERP-1117 Fix for editing theme not working anymore
ERP-1100 Some fixes related to entity transformation