Drop patches merged in 17.05