Merge "Use composition size limit on repeating effects" into tm-dev