Restructuring for #665 and #681
Updated changes log and executed all tests. Resolved remaining regressions.
Authored by: numere 2022-04-27
Parent: [r1128]
Child: [r1130]