MAJOR FIX - TODO: DISCUSS AND MAYBE REVIEW AND TEST
Merge origin/immutable1 into immutable1