Merge "Avoid shifts of negative values inflateMark()."