Bug: #1036006