Manually merging in @schwarzmedia's latest changes from https://github.com/schwarzmedia/bolt/commit/9f604ed48f6a41c4ca7ae9ee2e6b341662da2d9a