Handle processing promise callbacks independently from transition callback. Closes #2933
Merge branch 'master' into gh-pages