Merge "Update envelope effects dependencies" into main