Merged couple changes made accidentally on trunk