Chore maintenance tasks#15

Merged

TiSiE merged 5 commits intocross-solution:2.xfrom

TiSiE:chore-maintenance_tasks

Jul 2, 2020

Commits on Jun 16, 2020

Commits on Jun 18, 2020

chore: remove unnecessary code from test cases
TiSiE
committed

Commits on Jul 2, 2020

chore: merge upstream changes
TiSiE
committed