return pet immediately when setting a smart option
Merge remote-tracking branch 'origin/master'