Sprint20 merge

please verify SHA of submodule with

git submodule