SMW\DISerializer support unit output

Change-Id: I17a3e04653b3f55c294559a06f6b6cbba10e2f8d
Merge "SMW\DISerializer support unit output"