Mark as reviewed 676379

supersedes #1054