eliminate superfluous double call
remove unused function
ignore 'invoke' on different module
rather than exploding.
Merge bug25422
stable to default