Fixed build problems caused by merge from next.