Resolves: #891457