Follow-up of #5128, #5119, and #5135.
Follow-up of #5128, #5119, and #5135.