Comment out the undefined attributes
Merge branch 'branch_v3plus_3748' into 'master'