add auto-raise option
fix merge
Merge pull request #2423 from leigh123linux/patch-7

[2.2] add auto-raise option