prepare set method for general tab
more set method
Merge remote-tracking branch 'upstream/master'