Merged changes from earlier divergence