I`d suggest to rebase this to the current master.