Merge pull request #1891 from matrix-israel/fix_flowboard_compatibility