Merge remote-tracking branch 'origin/develop-3.0' into develop-3.0-jb