Merge in firebase changes
Merge branch 'master' into release