Merge remote-tracking branch 'origin/stable' into stable
Reverted checked attribute
Merge branch 'stable' into ffbadges