Appropriate change from 7.22 fixes.
New submodule commits.