[2.0] Improve extension registration logic

[2.0] Improve extension registration logic #1276