unified swirl
code cleanup
Merge branch 'master' into kfvideoexport
refactorings