Drop #996326 by @Singhvi