fix bug #66783

Merge remote-tracking branch 'origin/release/v8.1.0' into develop

Merge remote-tracking branch 'origin/release/v8.1.0' into develop

fix bug #66766

fix bug #66722

fix bug #66722

.

.

.

.