changes to __virtual__, default arguments and comments
Merge pull request #9674 from CSSCorp/develop

changes to __virtual__, default arguments and comments