Do not merge this - this is so QA will be able to test this pluin
(flash)