* Merge master into feature branch * Formatting * Remove redundant fixme * Remove files that snuck in * Fix backoff supervisor test