fix invokeBeforeExecute(), invokeAfterExecute()
Merge branch 'develop'