Merge branch 'fix-etc' into work
Merge branch 'fix-rsvman' into work

Conflicts:
	Common/StructDef.h