Bug 1011016 - marketplace dev