Fixed bugs, the "o2.then" module is working as expected now.
Merge branch 'refs/heads/patch/release-2.1.0' into release/2.1.0