[Loader]: Undo last two pushes due to present test failures.
Merge branch 'promise-trycatch' into dev-master