Modifications as described in bolt/bolt#615