6th iteration on ticket #589
Cleaned code and resolved some issues in integrate
Authored by: numere 2021-06-20
Parent: [r897]
Child: [r899]