Try to minimize the differences with master