Merge pull request #923 from ariard/2021-05-split-sign-justice