QUASAR: Merge resolution
Merge branch 'integration' of ssh://helios/home/git/repositories/Nova into integration