Oliver Kišš Ah, thanks! I am fine w/ porting that to 1.6.

If you have the bandwidth, can you submit such a PR ?