Attached is an updated patch based on current master after core-updates merge. `~Eric