Bug 847566 - Improve developer extension