Merge branch 'improve_cleanup' into 'master'

Implement temporary resources cleanup

See merge request !36
4 jobs for master in 27 minutes and 39 seconds (queued for 4 seconds)