Merge branch 'petterreinholdtsen-reuse-scanner' into packaging