Update submodule and submodule settings

See description in commit messages