Synching latest changes from trunc.