Fix build issue triggered by last branch merge