Merge branch 'jk/promisor-optim'