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

Update submodules
Update submodules