[39] Update due to changes in [12189] and [12606]