fix branch with constant bug
Merge branch 'master' into dev
update submodule