Initial commit of class hierarchy for data masking
Merge remote-tracking branch 'origin/masking' into masking