sake-bomb-phase3 merge

This merges the #1115 branch and attempts to fix some merge conflicts regarding some routes.