Drop #972301 by @Kostas