Merge remote-tracking branch 'nbm-suite-root/master' into preparation