Merge pull request #835 from claco/v4.2.2rc

Update submodules
Update submodule