This is a follow-up for ac2671e3
mentioned in commit 18fe4dd1
mentioned in commit 360847e0
mentioned in commit 37ba9826