Merge branch 'nfc-const'