Drop #1011553 by @kkostya