Opened an externs-based PR: #853