Issue #28556: two more small upstream changes by Ivan Levkivskyi (#329, #330) (3.5->3.6)