Velocity no longer needed
Merge branch 'mgsdl2-xact' into mgsdl2-hwinstance