Co-authored-by: Florin Strugariu <bebe@mozilla.ro>
Co-authored-by: Johan Lorenzo <jlorenzo@mozilla.com>