Merge tag 'rel/1.12'

RC1 vote has been accepted