Bug 1011016 - marketplace dev
Merge pull request #24539 from lightsofapollo/bug-1011016

Bug 1011016 - marketplace dev r=@RickyChien.