Noting merge of #1454.