I guess @ngvoice has been busy.
One question @szcom - is this change backwards compatible, in the way that is not breaking things when used together with older versions? If not, maybe it is better to add a mod param to control that, making it also easier to decide to merge.