Merge pull request #7173 from remitamine/criterion