Merge branch '25-from-2.15.1' into 28-applydefine
use replaceCall less often, after modifying promiseArgsTwo
Merge branch '28-applydefine' into 29