Drop #978659 by @Cindemirfatih