Lock overrides/disaggregation (5)

Lock overrides and selective disaggregation.