Merged seemingly identical changes