Comment out the undefined attributes
Merge branch 'branch_v2plus_3748' into branch_v2plus