Reduce code size by joining the two functionalities
Authored by: dannybackx 2021-04-29
Parent: [r387]
Child: [r389]