LMARKET-81 / LPS-33757:
Revised extension points.