Issues #21948 and #16040: Merge with 3.4.