updated submodules, resquash gras support on 3.6.4