> If you want I can create another pull request with this change for the other targets.

I'd actually appreciate if you were willing to consolidate that :-)

Thanks in advance,
Oliver