Fix merge from master