Closes #908, Closes #910, Closes #911, Closes #912 Co-authored-by: Jonathan Almeida <jalmeida@mozilla.com>