This MR consolidates all currently tested features in this branch, moving development back to the master branch.