merged refactoring from master

3 jobs for 40-container-rootless in 1 minute and 34 seconds (queued for 1 second)
latest
Status Job ID Name Coverage
  Linting
passed mypy #140745

00:00:36

passed pyflakes #140744

00:00:24

 
  Test
passed tests:debian #140746

00:00:57

100.0%