Fix/2.9/rb6998