[Finishes #42018947] for sin issues go to precious, later eden
Merge branch 'active'