Merge "Fix enrichment for multiplicated assignments" into jakarta