Version history for #4128 and #4146