Merge following change from main trunk.