updated from core (includes fix for Notes block that residency needs)