Workarounds for FF #730424
move reporting features to another branch