Merge "Fix error about multiple unsequenced modifications"