Integrated r/1406 (bug 1000804)