It is time to consolidate the source code. Let's include it in v4.x and also in v5.x. Do you want to work on this @mfdebian? _Originally suggested in #203_
