Merged second change