Fix Merge issues between custom and nested#359

Keats merged 4 commits intoKeats:masterKeats/validator:masterfrom

pvichivanives:masterpvichivanives/validator:masterCopy head branch name to clipboard