Merge pull request #692 from claco/v4.2.1rc

Update submodule
Update submodules