Merge pull request #3055 from yanesca/update_submodule_and_version_2.21.0

Update submodule and version 2.21.0