Merging latest changes to forked one