Lock overrides/disaggregation (4)

Lock overrides and selective disaggregation.