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