Yes, but it should be fixed in develop, not here. The point is to get the branches in sync.