* merge upstream/dev
* remove comment
* coverage increase
* merge upstream/dev
* refactor
* wait for another PR
* remove left overs
* wait for next PR
* only remove on successful unload
Co-authored-by: Shay Levy <levyshay1@gmail.com>
Co-authored-by: Shay Levy <levyshay1@gmail.com>