Fix/2.7/rb6963