Merge of 3 & 4
Snirt Meta Data Change