Nightly: merge with upstream master branch

Simply merged