Merge "Adds idShort validation & blacklist checking"