Changes introduced by @mayabrandi upstream