Can I merge in the meantime? @masterbee needs this sooner than later