Branch 'masking': fix problem with IDataParser