Merge remote-tracking branch 'last/develop-3.0' into develop-3.0