7.x 1.x alpha issue 264