update modules
merge with mainline
update submodules