Unfortunately the latest patch doesn't apply cleanly on the master branch. Can you please share an updated one.