Update of branch due failed update of 1.9.8