Merged source for 1.6 upgrade