Kong/kong + (-29) -

    Sorry about the long multi-topic commit, but due to the
      (that don't work I explained why in a comment :/ sorry @rainum)