Extensions lock and controllers priority optimisation

On the road to #456